wayland: Uncomment erroneously commented out code
authorBenjamin Otte <otte@redhat.com>
Tue, 6 Dec 2016 16:51:35 +0000 (17:51 +0100)
committerBenjamin Otte <otte@redhat.com>
Tue, 6 Dec 2016 16:51:35 +0000 (17:51 +0100)
I read the code as if (use_gl) instead of if (!use_gl) and commented it
out in bddfd7bb41cebd9b4e8ea418ce4d8e1f11822e81. That broke drawing on
Wayland without OpenGL completely.

Whoops.

Now it's back.

gdk/wayland/gdkwindow-wayland.c

index 603a0274ed9661bb24a33b2200bc0bc1cbdeda10..ec1123487200b573bfb12309692966af45bbae0c 100644 (file)
@@ -882,14 +882,12 @@ gdk_window_impl_wayland_begin_paint (GdkWindow *window)
 static void
 gdk_window_impl_wayland_end_paint (GdkWindow *window)
 {
-#if 0
   GdkWindowImplWayland *impl = GDK_WINDOW_IMPL_WAYLAND (window->impl);
   cairo_rectangle_int_t rect;
   int i, n;
 
   if (impl->staging_cairo_surface &&
       _gdk_wayland_is_shm_surface (impl->staging_cairo_surface) &&
-      !window->current_paint.use_gl &&
       !cairo_region_is_empty (window->current_paint.region))
     {
       gdk_wayland_window_attach_image (window);
@@ -921,7 +919,6 @@ gdk_window_impl_wayland_end_paint (GdkWindow *window)
 
       impl->pending_commit = TRUE;
     }
-#endif
 
   gdk_wayland_window_sync_margin (window);
   gdk_wayland_window_sync_opaque_region (window);